fix: normalize OAuth redirect URI URL subtypes#2744
Conversation
he-yufeng
force-pushed
the
fix/oauth-redirect-uri-url-subtypes-v2
branch
from
062b5b4 to
ffea4ae
Compare
StantonMatt
left a comment
StantonMatt
left a comment
There was a problem hiding this comment.
I think this still misses one input shape Pydantic accepts for this field. redirect_uris is typed as list[AnyUrl], but Pydantic also accepts tuples/sets and coerces them to a list. Because the before validator only normalizes list, a tuple of URL subtypes still stores the element as AnyHttpUrl, so the existing comparison against an incoming AnyUrl can fail:
info = OAuthClientInformationFull(
client_id="abc123",
redirect_uris=(AnyHttpUrl("https://example.com/callback"),),
)
info.validate_redirect_uri(AnyUrl("https://example.com/callback"))
# InvalidRedirectUriError: Redirect URI 'https://example.com/callback' not registered for clientI verified the list cases are fixed on ffea4ae; raw-string lists, AnyHttpUrl lists, mixed lists, and single-URI default selection all behave as expected. Local checks also pass:
uv run --frozen pytest tests/shared/test_auth.py -quv run --frozen ruff check src/mcp/shared/auth.py tests/shared/test_auth.pyuv run --frozen ruff format --check src/mcp/shared/auth.py tests/shared/test_auth.pyuv run --frozen pyright src/mcp/shared/auth.py tests/shared/test_auth.py
Could the normalizer cover the other collection inputs Pydantic accepts here too?
he-yufeng
force-pushed
the
fix/oauth-redirect-uri-url-subtypes-v2
branch
from
ffea4ae to
99b80b5
Compare
|
Covered the additional collection inputs in The before-validator now normalizes Validation: |
2 participants
Summary
redirect_urisvalues at the OAuth client metadata boundaryAnyUrl, and URL subtype inputs serializing the same wayAnyHttpUrlregistration followed byAnyUrlredirect validationTo verify
.\.venv\Scripts\python.exe -m pytest tests\shared\test_auth.py -q.\.venv\Scripts\python.exe -m ruff check src\mcp\shared\auth.py tests\shared\test_auth.py.\.venv\Scripts\python.exe -m ruff format --check src\mcp\shared\auth.py tests\shared\test_auth.pygit diff --checkRefs #2687